ChangeLog merge fix.
authorGlenn Morris <rgm@gnu.org>
Mon, 13 Dec 2010 17:18:55 +0000 (09:18 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 13 Dec 2010 17:18:55 +0000 (09:18 -0800)
commit80037c0d10837f25d4190f6c187057103aea8fff
tree32920ab82334c69db15ba2f881da469916497699
parent52a4098914a8b04907e3aec9446b57f338d17f56
ChangeLog merge fix.
doc/emacs/ChangeLog